From acaaca4c7657d3b174976b6d919bc1582576e81a Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 9 Jun 2011 06:16:23 +0200
Subject: [PATCH] gail: Fix scrollbar index_in_parent() implementation

---
 modules/other/gail/gailscrollbar.c | 43 ++++++++++++++----------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/modules/other/gail/gailscrollbar.c b/modules/other/gail/gailscrollbar.c
index 7bdae98a92..5d93c9ac0d 100644
--- a/modules/other/gail/gailscrollbar.c
+++ b/modules/other/gail/gailscrollbar.c
@@ -59,9 +59,9 @@ gail_scrollbar_get_index_in_parent (AtkObject *accessible)
 {
   GtkWidget *widget;
   GtkWidget *parent;
+  GtkWidget *child;
   GtkScrolledWindow *scrolled_window;
-  gint n_children;
-  GList *children;
+  gint id;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
 
@@ -79,31 +79,28 @@ gail_scrollbar_get_index_in_parent (AtkObject *accessible)
     return ATK_OBJECT_CLASS (gail_scrollbar_parent_class)->get_index_in_parent (accessible);
 
   scrolled_window = GTK_SCROLLED_WINDOW (parent);
-  children = gtk_container_get_children (GTK_CONTAINER (scrolled_window));
-  n_children = g_list_length (children);
-  g_list_free (children);
-
-  if (GTK_IS_HSCROLLBAR (widget))
-  {
-    if (!gtk_scrolled_window_get_hscrollbar (scrolled_window))
+  id = 0;
+  child = gtk_bin_get_child (GTK_BIN (scrolled_window));
+  if (child)
     {
-      n_children = -1;
+      if (widget == child)
+        return id;
+      id++;
     }
-  }
-  else if (GTK_IS_VSCROLLBAR (widget))
-  {
-    if (!gtk_scrolled_window_get_vscrollbar (scrolled_window))
+
+  child = gtk_scrolled_window_get_hscrollbar (scrolled_window);
+  if (child)
     {
-      n_children = -1;
+      if (widget == child)
+        return id;
+      id++;
     }
-    else if (gtk_scrolled_window_get_hscrollbar (scrolled_window))
+  child = gtk_scrolled_window_get_vscrollbar (scrolled_window);
+  if (child)
     {
-      n_children++;
+      if (widget == child)
+        return id;
     }
-  }
-  else
-  {
-    n_children = -1;
-  }
-  return n_children;
+
+  return -1;
 } 
-- 
2.30.2